removed unnessecerie things