Cleanup, new jiveid