Demo

merge demo and cleanup