Micro-code cleanup