Cleaning up demo