Server cleanup
Remove builder
Refactor
Fix eco dependency
Cleanup
Bump version