Removing some of the TODO items of views