Got rid of some bogus code (bad merge?)