move steps into compile other cleanups