Removed legacy job from data, added TODO for future refactoring