removed some garbage code that should have never been added!