[007] code cleanup