Added remove cart link back and I may have fixed the remove main nag bar override finally.