Remove usage of deprecated command API