The work continues, trimming unneeded functions from the primary classes.