Sync with Kelly ... 2014.07.24
remove .dxx and .map