Ex03 + ex02 cleanup.