Tidy up of imports and warnings. Still some left to resolve.
Merge branch 'origin/develop'