- Cleanup some null checks and remove deprecated methods in Item and Block