more on pattern matching
comment out some dead macros