removed some stupid things