remove more unnecessary