found more errors in remove