Clean up some