Relocate comments and remove superfluous code.