Remove hardcoded commands