Removed unused code and views