Code cleanup - library is now used