removed unnessesary stuff