Move action calls to driver
More cleanup
Fixes for clean up
Merge branch 'clean-code-1' into develop