New clean up for opacity values