remove () replace (now in lib)