removed unneeded old stuff