cleaning up some dirty stuff