remove duplicity in lib