Reverting some commits and cleaning up some code related to I/O schedules (specifically elevator)