Use new/delete for entity extra rotations
Remove NULL check