Cleanup, added in VR and SIO I/O schedulers

Change-Id: Ieef682e9825475f9bff804833698291de8361cba