Cleanup and remove cruft