Removed the extra libs in contrib.
I'm more worried about basic stuff and getting that working.  Will
revisit that stuff later.  For now it makes things simpler and cleaner.
I also updated docs to reflect that.