Removed command condition validation