* UPDATE code cleanup