Remove duplicate methods
Refactoring