clean-up + additional ops implementation such as bind