removed some unneccescary stuff