Remove redundant bit clears from diff_setup()