Clean up moar stuff