demo clean up