Removed block entities, rewrote parts of block API