Functions for other packages removed.