Removed unused dependencies and upgraded ES to 0.90.9