Removed unused code
Added rename keys.