master: remove map files
omega: merge master