Cleanups of some unused attributes and functions.