clilib is no longer needed, let's get back to use lib.inc for everything