Removed unused classes
Declared private fields 'final'