Removed server side dependencies