Remove more of scratch