Cleanup, jive-sdk refactor