Getting rid of commented out cruft