Cosmetic changes

Removed unused routine and interface. Change CMakeLists.txt file
because apparently NAG doesn't search for module files in the
directory where it creates module files (doh!)
3 jobs for master in 8 minutes and 27 seconds
Status Job ID Name Coverage
  Build
passed #199665463
docker
doc

00:06:35

 
  Deploy
passed #199665464
pages

00:01:52

passed pages:deploy

00:05:13