more cleaning

there are many useless things in your code