removed some silly code