diff --git a/MakefileFOSS.cfg b/MakefileFOSS.cfg
deleted file mode 100644
index 8456972c300d424be84d2c6e7fbacd721242f504..0000000000000000000000000000000000000000
--- a/MakefileFOSS.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-# Configurations for the Free Open Source Software version
-LICENSING := no
-USAGE_STATS := no
diff --git a/makefiles/Makefile.personal.tcclab5 b/makefiles/Makefile.personal.tcclab5
index e1fca369fb761c11fec8a37de84cdb8f8cf1977c..7a6dd302825de44bb5cab58e0351f11ad1d0be27 100644
--- a/makefiles/Makefile.personal.tcclab5
+++ b/makefiles/Makefile.personal.tcclab5
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2000-2016 Ericsson Telecom AB
+# Copyright (c) 2000-2017 Ericsson Telecom AB
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -14,16 +14,6 @@
 ##############################################################################
 ## Based on /etc/autotest/titan_builder_cfg.py
 
-FLEX  := /usr/bin/flex
-BISON := /usr/bin/bison
-
-COMPILERFLAGS += -pipe -pedantic -Wno-long-long -Wno-variadic-macros -Wextra
-CCFLAGS += -Wno-overlength-strings
-LDFLAGS += -Wl,-export-dynamic
-
-#CC := gcc-48
-#CXX:= g++-48
-
 OPENSSL_DIR := default
 
 JDKDIR := /home/titanrt/jenkins/jdk/jdk64