Clean up ExecuteCommand