Remove hard coding for adhoc-scheduling