General clean up for demo