Removed some dead code. Added entity palettes