Cleand up some of the scratch code.