fix bug 40
simplify macro parser
remove Macro
remove DEFINE UNDEF those macro keywords
snapshot to cold base
clean