take out old testing stuff