Got rid of containers/heap for scheduling