All these commented rows should be deleted - I don't mind if you delete them here or in a separate PR. Same goes for the other views.