Removing potential hazards