Getting rid of superfluous comments