Remove commented out cruft