cleaning up some stuff specific to our usage