Adding code steps details and removing old keys