Fix remove() and complete removeWithoutCopy().
Complete all methods.
Fix merge issues.