Do not redefine the default argument
Comment out functions flagged as unused bu clang