Upgrade examples to new behaviour; remove defunct module