Removed some completely unused objects dating from years ago.