finished cleanup of library components