Eliminate LOCAL_BUFFER code
Tidy map() code and add an on/off switch for all identifiers