Remove ext commands to re-add in single commit