clean up some uncommited changes