Further bibtext cleanup