clean up some unnecessary stuff
fixed thing
fixing merge
changes