Finished removing types from Keys.