cleaning up some bits