removing bad merge stuff (tgb's fault)