updated to detect and rem