Remove unnecessary line.
Disable obsolete entry.
Comment out the xmodmap stuff, now done in dconf.