removed not needed stuff