Some cleanups to commands using manager.execute events