Update examples after code cleanup