remove more demo stuff