remove some silly code