Refactoring: deleting com