Remove commented-out debug statements
Remove original ad-hoc testing code