code cleaup, removed unused libs