remove more npe