Removed the edit link variable which was used in the heading 'Users with the role ..' but was never displayed due to filters. Other minor tidy ups as well. Part of MDL-59290.