Simplify code. Remove redundant calls. Reformat code, remove trailing whitespaces, remove duplicate tests. See #1802 Original pull request: #1810