a bit of clean-up
Merge branch 'dev-local'