different default mapping for rev 4
remove commented code
remove unused #defines