Remove obsolete, and rearange xinitrc.