restored factory + command in preparation for registered + command in next release
example cleanup