removed extraneous debugging code and misleading fixmes