Format with clang-format.
Removed unused #ifdef
Format with clang-format
Merge branch 'release/1.3.2'