Fixed unused use statements (part 2)
Removed unused vars
Merge branch 'feature/insight_fixes' into develop