cleaning up moar