Remove all except engine, need more engine refactoring