commented/deleted old stuff