Partial Cleanup

Started cleanup of Block and Item Registry.