Removing commandHandler (rename)