"Inner keying" fixes. Unused project removed.