More RockPage/RockBlock cleanup