odo v2.2.0 will create devfile components based on s2i components. That will require tor remove --s2i option from commands and test if any additional changes are required to deal with existing s2i components in users workspace.