removing unused entities
porting everything over