REFACTOR Cleanup outdated files