Big cleanup for roxygen4