Fixed non-data return on remove()