Get rid of custom collections
get rid of bindable factories
Code cleanups.