some further cleanup - rocket