final cleanup of new Backbone code