diff --git a/client/loclass/loclass_main.h b/client/loclass/loclass_main.h
deleted file mode 100644
index b6d58a8bc..000000000
--- a/client/loclass/loclass_main.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef LOCLASS_MAIN_H
-#define LOCLASS_MAIN_H
-
-#endif // LOCLASS_MAIN_H
diff --git a/client/loclass/main.c b/client/loclass/main.c
deleted file mode 100644
index 8fb9c0494..000000000
--- a/client/loclass/main.c
+++ /dev/null
@@ -1,120 +0,0 @@
-/*****************************************************************************
- * WARNING
- *
- * THIS CODE IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY.
- *
- * USAGE OF THIS CODE IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL
- * PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL,
- * AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES.
- *
- * THIS CODE SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS.
- *
- *****************************************************************************
- *
- * This file is part of loclass. It is a reconstructon of the cipher engine
- * used in iClass, and RFID techology.
- *
- * The implementation is based on the work performed by
- * Flavio D. Garcia, Gerhard de Koning Gans, Roel Verdult and
- * Milosch Meriac in the paper "Dismantling IClass".
- *
- * Copyright (C) 2014 Martin Holst Swende
- *
- * This is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as published
- * by the Free Software Foundation, or, at your option, any later version.
- *
- * This file is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with loclass.  If not, see <http://www.gnu.org/licenses/>.
- *
- *
- ****************************************************************************/
-
-
-#include <stdio.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <unistd.h>
-#include <ctype.h>
-#include "cipherutils.h"
-#include "cipher.h"
-#include "ikeys.h"
-#include "fileutils.h"
-#include "elite_crack.h"
-
-int unitTests() {
-    int errors = testCipherUtils();
-    errors += testMAC();
-    errors += doKeyTests(0);
-    errors += testElite();
-    if (errors) {
-        PrintAndLogDevice(NORMAL, "OBS! There were errors!!!");
-    }
-    return errors;
-}
-int showHelp() {
-    PrintAndLogDevice(NORMAL, "Usage: loclass [options]");
-    PrintAndLogDevice(NORMAL, "Options:");
-    PrintAndLogDevice(NORMAL, "-t                 Perform self-test");
-    PrintAndLogDevice(NORMAL, "-h                 Show this help");
-    PrintAndLogDevice(NORMAL, "-f <filename>      Bruteforce iclass dumpfile");
-    PrintAndLogDevice(NORMAL, "                   An iclass dumpfile is assumed to consist of an arbitrary number of malicious CSNs, and their protocol responses");
-    PrintAndLogDevice(NORMAL, "                   The binary format of the file is expected to be as follows: ");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                   <8 byte CSN><8 byte CC><4 byte NR><4 byte MAC>");
-    PrintAndLogDevice(NORMAL, "                  ... totalling N*24 bytes");
-    PrintAndLogDevice(NORMAL, "                  Check iclass_dump.bin for an example");
-
-    return 0;
-}
-
-int main(int argc, char **argv) {
-    PrintAndLogDevice(NORMAL, "IClass Cipher version 1.2, Copyright (C) 2014 Martin Holst Swende\n");
-    PrintAndLogDevice(NORMAL, "Comes with ABSOLUTELY NO WARRANTY");
-    PrintAndLogDevice(NORMAL, "Released as GPLv2\n");
-    PrintAndLogDevice(NORMAL, "WARNING");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "THIS TOOL IS CREATED FOR EXPERIMENTATION AND EDUCATIONAL USE ONLY. ");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "USAGE OF THIS TOOL IN OTHER WAYS MAY INFRINGE UPON THE INTELLECTUAL ");
-    PrintAndLogDevice(NORMAL, "PROPERTY OF OTHER PARTIES, SUCH AS INSIDE SECURE AND HID GLOBAL, ");
-    PrintAndLogDevice(NORMAL, "AND MAY EXPOSE YOU TO AN INFRINGEMENT ACTION FROM THOSE PARTIES. ");
-    PrintAndLogDevice(NORMAL, "");
-    PrintAndLogDevice(NORMAL, "THIS TOOL SHOULD NEVER BE USED TO INFRINGE PATENTS OR INTELLECTUAL PROPERTY RIGHTS. ");
-
-
-    char *fileName = NULL;
-    int c;
-    while ((c = getopt(argc, argv, "thf:")) != -1)
-        switch (c) {
-            case 't':
-                return unitTests();
-            case 'h':
-                return showHelp();
-            case 'f':
-                fileName = optarg;
-                return bruteforceFileNoKeys(fileName);
-            case '?':
-                if (optopt == 'f')
-                    fprintf(stderr, "Option -%c requires an argument.\n", optopt);
-                else if (isprint(optopt))
-                    fprintf(stderr, "Unknown option `-%c'.\n", optopt);
-                else
-                    fprintf(stderr,
-                            "Unknown option character `\\x%x'.\n",
-                            optopt);
-                return 1;
-                //default:
-                //showHelp();
-        }
-    showHelp();
-    return 0;
-}
-