Start of removing types from Keys.