Code clean, unused classes
Add helper methods