more cleanup on demos for validation study