removed a lot of old stuff