Removed double remove detection.