Modify views to add comments
Remove two views not used