Jack driver code cleanup