block: clean up misc stuff after block layer timeout conversion