Clean up some silliness