Code

Simplify "make check" makefile rules and remove most of the obsolete