rearrange map options, remove unnecessary include