Ultraminor code cleanup