Refactor class operations
Remove unused methods