Added comments / remove listviews