Removing old files as part of refactoring