VP-297: Clean up model connections; get scrubber passing tests. Now scrubber doesn't actually *work*