Some demo clean up