Revert "Modified files to recognize new libraries"

This reverts commit 339da580df81d3be35807428099b5dd5d6f1b4a6.