Removed some unneeded settings and experimental mappings.