Remove Job; rename runnable to task