Remove comments
Upgrade to Cmd 5.0.1