Command renamed
Unused statements removed