Clean up, add some more, please don't stop