step 1 of cleanup
step 2 of cleanup: re-added files