removed config options which were marked TODO