Fix key layouts and clear out some useless ones