Removed unused files. Took care of the views