IF uncommented, cleanup