removed unnessecary stuff