cleaned up logic around force_setup parameter.