Remove unused imports
Small updates to .yaml file