debug, clean up