remove unecessary stuff
remove unecessary stuff