Remove unused keylayout, fix load our keylayout