comment out when clause