cleanup
move Linux & OS X to per-map access tokens