Ok I will remove the remaining() check as well then. Also will update error message based on Andrew's feedback and refactor some naming of LocalCluster. Then wait for branch to be blue.