Cleaned up some unused members.