rm obsolete stuff; improve example