Remove code that might be masquerading bug