moar clean up