Merge "Remove redundant StreamHandler"