Refactoring - removing stale files