Cleaning up some moar