renaming
removed some keys