Fixed missing cart upon Login via Social network
+some unused imports cleanup