Removed un needed stuff