Remove IDE refactoring artifacts...