[refactoring] cleaned up a few more libs