Remove trace macro, move back to scalac