Revert "Analytic and Job"

This reverts commit 8e1d236d962b44f7aeaa39ccc2767f4e04989741.