removed useless code from commands