moar clean-up