[D853] Code cleanup