remove some unsefull code and comments