remove unused code
enhance demo feature