minor updates, remove one map