Fix the commands
Cleanup