Add a check and remove script