Revisited keys again with removing silly prefixing everything
Removed final traces of redundant keys