reverted changes due to misleading clang unused warnings