removed non needed stuff