Demo clean up