38-code cleanup