Merge "Delete jack support"