* pkparser cleanup