Removed library dependencies made obsolete by last commit.