Merge branch 'scrollspy' into develop
Merge branch 'scrollspy' into develop
Remove unused files, slight tweak to imports as a resut