Removed some nonsense from the engine proper