Cleaned up the base object so some old code was removed.