Clean up
More clean up
Merge branch 'work' into develop