Cleaned up some files for legacy code removal.