Nonfunctional code cleanup