Fixed commandhandler remove function