Ensure that links in nav bar are white.  Also did a little cleanup of unused code