Cleaning up functions and older classes.