cleaning up some chaffe