Removed unused dependencies

Removed WebApi dependency, refactored and fixed a bit client side.