Got rid of local lib dependencies