Merge "Remove unused views"