Refactored lib
Remove libs