Remove the controlled entity stuff, it's rather tacky at this moment in time.