Some cleaning
Remove useless things