Remove command classes as they are not required in core