Minor hyperspeed cleanup