Add remove() comments and delete unneeded unlock in create()