Clean up of processor expert components