Quickie cleanup for test demo