Refactoring

Remove unused views
Removed unused methods
Removed unused code