New libs, kudos cleanup