Refactoring, remove unused libs