removed some unused things clang warned about