Fixing previous commit by removing work-in-progress changes in some files