try to reuse more code on remove accessor