remove some waste of code