removed some stupid stuff