Remove useless things
removing old useless stuff