refactored deleted methods