Fixed views
Removed unused code