remove duplicate method; fix un-tupled lambda params