Cleanup Part 1 (only the beginning of my work)