update several files for cleanup purposes