removing unnecessary stuff
removing more stuff