Removed last traces of dplyr for now.