refactoring

Unused class deleted, modificators corrected