reverting some more
removing more stuffs