Clean up some bits