removing two deprecated views
adding comments