Remove debug messages, more testing.