remove mapping dict and add pairs list