proper return value on remove