cleaning unused conditionals