- purged operations not being used
- refactored some code