Trivial fixes sprint12

Keeping our janitorial work, fix a bunch of unused variables, one dir we were forgetting to clean in 'make clean', and fixing a bug with the multiplexer plugin -c option.