* UPDATE Cleanup removed some unused code.