cpu.cpp - cleanups