removed some unnessesary stuff