remove debug messages, clean up