Fixes after rebase for conflicting module_render.py
Fixes after rebase
Remove scaffolding