diff --git a/CMakeLists.txt b/CMakeLists.txt
index 650fc0c2..ee8a8ee0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,21 +84,15 @@ elseif(UNIX)
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast \
 			-fno-signed-zeros -freciprocal-math -ffp-contract=fast \
                         -fno-threadsafe-statics -fslp-vectorize-aggressive -fslp-vectorize \
-		     	-fno-stack-protector -fstrict-enums -fno-spell-checking \
-			-fno-coverage-mapping -fstrict-vtable-pointers -finline-functions \
-		       	-finline-hint-functions -fshort-enums -fno-unroll-loops \
-			-flto -fwhole-program-vtables")
-
-		# these only work on 3.9+ -finline-functions -finline-hint-functions
-		# these only work on 3.8+ -fno-coverage-mapping -fstrict-vtable-pointers
+		     	-fno-stack-protector -fstrict-enums -fstrict-vtable-pointers \
+			-fno-coverage-mapping -fno-spell-checking -fshort-enums -finline-functions \
+			-finline-hint-functions -fno-unroll-loops")
 
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -ggdb")
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 		# O3 and Ofast include one or more flags that cause java to crash when using gcc6
-		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-signed-zeros -freciprocal-math \
-			-fno-unroll-loops -fno-tree-loop-optimize \
-			-fabi-version=9 -fabi-compat-version=9")
-		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og -fabi-version=9 -fabi-compat-version=9")
+		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2 -fno-signed-zeros -freciprocal-math -fno-unroll-loops -fno-tree-loop-optimize")
+		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Og")
 	elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
 		set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 	endif()
@@ -108,7 +102,7 @@ elseif(UNIX)
 		-msse -msse2 -msse3 -mmmx -m3dnow \
 		-Wformat -Wno-overloaded-virtual -Wno-missing-braces -Wno-format \
 		-Wno-write-strings -Wno-unknown-pragmas \
-		-Wno-uninitialized -Wno-reorder -Wno-tautological-constant-out-of-range-compare") 
+		-Wno-uninitialized -Wno-reorder -Wno-tautological-constant-out-of-range-compare")
 
 	add_definitions(-DLINUX -D_REENTRANT -Dlinux -D_USING_STL -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -U_FORTIFY_SOURCE)
 endif()
diff --git a/engine/server/application/CommoditiesServer/src/CMakeLists.txt b/engine/server/application/CommoditiesServer/src/CMakeLists.txt
index fcdc03ec..8ba55ff9 100644
--- a/engine/server/application/CommoditiesServer/src/CMakeLists.txt
+++ b/engine/server/application/CommoditiesServer/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/CommoditiesServer.profdata)
-
 set(SHARED_SOURCES
     shared/AuctionBid.cpp
     shared/AuctionBid.h
diff --git a/engine/server/application/CommoditiesServer/src/linux/CommoditiesServer.profdata b/engine/server/application/CommoditiesServer/src/linux/CommoditiesServer.profdata
deleted file mode 100644
index 42b16bcb..00000000
Binary files a/engine/server/application/CommoditiesServer/src/linux/CommoditiesServer.profdata and /dev/null differ
diff --git a/engine/server/application/ConnectionServer/src/CMakeLists.txt b/engine/server/application/ConnectionServer/src/CMakeLists.txt
index 3ed472cf..6737fd50 100644
--- a/engine/server/application/ConnectionServer/src/CMakeLists.txt
+++ b/engine/server/application/ConnectionServer/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/ConnectionServer.profdata)
-
 set(SHARED_SOURCES
     shared/CentralConnection.cpp
     shared/CentralConnection.h
diff --git a/engine/server/application/ConnectionServer/src/linux/ConnectionServer.profdata b/engine/server/application/ConnectionServer/src/linux/ConnectionServer.profdata
deleted file mode 100644
index 5642b9cf..00000000
Binary files a/engine/server/application/ConnectionServer/src/linux/ConnectionServer.profdata and /dev/null differ
diff --git a/engine/server/application/LoginServer/src/CMakeLists.txt b/engine/server/application/LoginServer/src/CMakeLists.txt
index 6a1c07e1..7f53d812 100644
--- a/engine/server/application/LoginServer/src/CMakeLists.txt
+++ b/engine/server/application/LoginServer/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/LoginServer.profdata)
 
 set(SHARED_SOURCES
     shared/CentralServerConnection.cpp
@@ -50,8 +49,6 @@ set(SHARED_SOURCES
     shared/TaskGetClusterList.h
     shared/TaskGetValidationData.cpp
     shared/TaskGetValidationData.h
-	shared/TaskMapAccount.h
-	shared/TaskMapAccount.cpp
     shared/TaskRegisterNewCluster.cpp
     shared/TaskRegisterNewCluster.h
     shared/TaskRenameCharacter.cpp
@@ -78,7 +75,7 @@ if(WIN32)
 else()
 	set(PLATFORM_SOURCES
 		linux/main.cpp
-            shared/TaskMapAccount.h shared/TaskMapAccount.cpp)
+	)
 endif()
 
 include_directories(
diff --git a/engine/server/application/LoginServer/src/linux/LoginServer.profdata b/engine/server/application/LoginServer/src/linux/LoginServer.profdata
deleted file mode 100644
index bef02d34..00000000
Binary files a/engine/server/application/LoginServer/src/linux/LoginServer.profdata and /dev/null differ
diff --git a/engine/server/application/PlanetServer/src/CMakeLists.txt b/engine/server/application/PlanetServer/src/CMakeLists.txt
index 21ceeab9..e0eefd7a 100644
--- a/engine/server/application/PlanetServer/src/CMakeLists.txt
+++ b/engine/server/application/PlanetServer/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/PlanetServer.profdata)
-
 set(SHARED_SOURCES
     shared/CentralServerConnection.cpp
     shared/CentralServerConnection.h
diff --git a/engine/server/application/PlanetServer/src/linux/PlanetServer.profdata b/engine/server/application/PlanetServer/src/linux/PlanetServer.profdata
deleted file mode 100644
index 350e7a27..00000000
Binary files a/engine/server/application/PlanetServer/src/linux/PlanetServer.profdata and /dev/null differ
diff --git a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
index 7e1c0131..776d387f 100644
--- a/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
+++ b/game/server/application/SwgDatabaseServer/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/SwgDatabaseServer.profdata)
-
 set(SHARED_SOURCES
     shared/buffers/AuctionLocationsBuffer.cpp
     shared/buffers/AuctionLocationsBuffer.h
diff --git a/game/server/application/SwgDatabaseServer/src/linux/SwgDatabaseServer.profdata b/game/server/application/SwgDatabaseServer/src/linux/SwgDatabaseServer.profdata
deleted file mode 100644
index 63942cab..00000000
Binary files a/game/server/application/SwgDatabaseServer/src/linux/SwgDatabaseServer.profdata and /dev/null differ
diff --git a/game/server/application/SwgGameServer/src/CMakeLists.txt b/game/server/application/SwgGameServer/src/CMakeLists.txt
index 6da4fb55..8b7318ef 100644
--- a/game/server/application/SwgGameServer/src/CMakeLists.txt
+++ b/game/server/application/SwgGameServer/src/CMakeLists.txt
@@ -1,6 +1,4 @@
 
-add_compile_options(-fprofile-instr-use=${PROJECT_SOURCE_DIR}/src/linux/SwgGameServer.profdata)
-
 set(SHARED_SOURCES
     shared/combat/combat.def
     shared/combat/CombatEngine.cpp
diff --git a/game/server/application/SwgGameServer/src/linux/SwgGameServer.profdata b/game/server/application/SwgGameServer/src/linux/SwgGameServer.profdata
deleted file mode 100644
index 65914d37..00000000
Binary files a/game/server/application/SwgGameServer/src/linux/SwgGameServer.profdata and /dev/null differ