Remove files, and final touches