Removed unneeded proxies
Fixed grunt server command