Remove use of getCommandClass