Refactoring and deletions