removed some silly bits