Trimming the Fat

Some extra libraries that were not needed are being removed in this
commit.