Improve the structure of the  features to make it less brittle.
Automatic style corrections courtesy of autopep8.
Remove no-longer-needed component argument from .
Automatic style corrections courtesy of autopep8.
BUG-FIX:  was not disconnecting the model line.