remove superfluous comments and tests