remove debug messages, cleanup, more messages at top #416