rm obsolete file, point files that were using it to stub for subsequent refactoring