Remove cruft, bind collection on update