finish clean up to match new library version