Remove unused mutex
Add gen command