Merge "Remove remaining Jackson"