more cleanup for demo