Make dataset tests green.
Remove old dataset controller.