Use macro version of println
remove dead code