Removing references to viewfinder