Delete unused code and bad featrue