remove more unnecessary code