[#71587328] Cleaning up code for PR.