Remove obsolete files following recent refactoring