Finally get rid of lib/Misc!
Restore 'debug' and 'run' commands
Clean-up