Remove map tweaks, some config changes