GRAS-1670 Added event removal, and listener cleanup in view remove