misc cleanup old stuff