Remove comments from conditions