bootstrap desugar
misc cleanup