Remove unused targets
Remove unused imports
Fix unit tests