Cleanup of stubs, added example