remove unused and update demo