Remove code causing labels to be always visible - more trouble than it's worth for now