Refactored destroy methods to use module