chore(engine): clean up some code