Removed unused method
More refactoring