Removed some garbage code