Bind a source to its task earlier, + remove some unused views.