Refactor: Remove bind2