Add if exists to clean up drops