cleaned a bunch of old stuff up