more cleanup of engine design