removed un-needed stuff...