removed scheduleQ check from all the places