removed un-needed stuff