diff --git a/paludis/package_env.conf b/paludis/package_env.conf
index 7258fda..a56ef10 100644
--- a/paludis/package_env.conf
+++ b/paludis/package_env.conf
@@ -75,7 +75,6 @@ media-libs/mesa gcc
 media-libs/sdl2-gfx gcc
 media-video/ffmpeg gcc
 media-video/guvcview gcc
-net-nds/openldap gcc
 net-firewall/pglinux gcc
 net-libs/libmnl gcc
 net-libs/opal gcc
diff --git a/paludis/sets/games.conf b/paludis/sets/games.conf
index 80800ad..45a3bb9 100644
--- a/paludis/sets/games.conf
+++ b/paludis/sets/games.conf
@@ -13,7 +13,7 @@
 * games-action/minetest_game
 #games-action/minetest_survival
 #games-action/openastromenace
-* games-action/openclonk
+#* games-action/openclonk
 #* games-action/solar2
 * games-action/supertuxkart
 #games-action/super-hexagon
@@ -33,7 +33,7 @@
 * games-board/awale
 * games-board/capicity
 #games-board/cockatrice
-* games-board/eboard
+#* games-board/eboard
 * games-board/pioneers
 * games-board/pychess
 * games-board/pysolfc
@@ -69,16 +69,16 @@
 * games-fps/eduke32
 * games-fps/freedoom
 * games-fps/quake3
-* games-fps/sauerbraten
+#* games-fps/sauerbraten
 #games-fps/turtlearena
-* games-fps/unvanquished
-* games-fps/urbanterror
+#* games-fps/unvanquished
+#* games-fps/urbanterror
 * games-fps/warsow
-* games-fps/xonotic
+#* games-fps/xonotic
 #games-kids/crayon-physics
 * games-misc/autumns-journey
 * games-misc/cowsay
-* games-misc/doge
+#* games-misc/doge
 * games-misc/dont-starve
 * games-misc/fortune-mod
 * games-misc/fortune-mod-chucknorris
@@ -99,7 +99,7 @@
 * games-puzzle/tiny-and-big
 * games-roguelike/FTL
 * games-roguelike/stone-soup
-* games-roguelike/tome4
+#* games-roguelike/tome4
 * games-rpg/a-bird-story
 * games-rpg/arx-fatalis-data
 * games-rpg/arx-libertatis
@@ -112,39 +112,39 @@
 * games-rpg/flare
 * games-rpg/grimrock
 * games-rpg/kqlives
-* games-rpg/mana
-* games-rpg/manaplus
+#* games-rpg/mana
+#* games-rpg/manaplus
 #* games-rpg/morrowind-data
 * games-rpg/penumbra-collection
 * games-rpg/pillars-of-eternity
 * games-rpg/sumwars
-* games-rpg/tmw
+#* games-rpg/tmw
 * games-rpg/to-the-moon
 * games-rpg/valyriatear
 * games-rpg/wasteland2
-* games-rpg/zsdx
-* games-rpg/zsxd
+#* games-rpg/zsdx
+#* games-rpg/zsxd
 * games-strategy/0ad
 #games-strategy/defcon-demo
 * games-strategy/dunelegacy
 * games-strategy/freeciv
 #games-strategy/freecol
-* games-strategy/freeorion
+#* games-strategy/freeorion
 * games-strategy/freeserf
 * games-strategy/freesynd
-* games-strategy/hedgewars
+#* games-strategy/hedgewars
 * games-strategy/ja2-stracciatella
 #games-strategy/opendungeons
 * games-strategy/openra
 * games-strategy/s25rttr
 #games-strategy/ufo-ai
-* games-strategy/uqm
+#* games-strategy/uqm
 #games-strategy/wargus
 * games-strategy/wesnoth
 #games-strategy/widelands
 * games-strategy/zod-engine
 #* games-util/desurium-meta
 * games-util/joystick
-* games-util/lutris
-* games-util/osavul
+#* games-util/lutris
+#* games-util/osavul
 #games-util/xgamer
diff --git a/paludis/sets/optional.conf b/paludis/sets/optional.conf
index 9612614..fdcbb95 100644
--- a/paludis/sets/optional.conf
+++ b/paludis/sets/optional.conf
@@ -7,7 +7,7 @@
 * dev-python/pyliblzma
 
 # for sftp access to tahoe-lafs node
-* dev-python/twisted-conch
+#* dev-python/twisted-conch
 
 # youtube-viewer
 * dev-perl/Text-CharWidth
diff --git a/paludis/sets/testing.conf b/paludis/sets/testing.conf
index 665828d..023887d 100644
--- a/paludis/sets/testing.conf
+++ b/paludis/sets/testing.conf
@@ -1,6 +1,6 @@
 #app-emulation/vboxgtk
-* dev-lua/luvit
-* media-gfx/pornview
-* www-misc/profile-sync-daemon
+#* dev-lua/luvit
+#* media-gfx/pornview
+#* www-misc/profile-sync-daemon
 #x11-misc/sunflower