debugging, clean up