Remove job abstraction