more retina func cleanup