Fix tests
Remove unused project
Start refactoring optimizations