The hard slog to remove jQuery as a dep
Removing jQuery dep + small cleanup