Removed Items and Blocks and cleaned up the code a little.