Remove nonfunctional code