cleanup examples for new syntax; remove extraneous src code