(enhancement) Cleanup of all the things