Remove unsed type parameter `That`
Fix scaladoc reference
Add move method instead of duplicate