Was not correctly removing existing bindings
Some fixes