Removed some silly stuff