diff --git a/java/rocksjni/options.cc b/java/rocksjni/options.cc
index 6cde26327..0f4c19232 100644
--- a/java/rocksjni/options.cc
+++ b/java/rocksjni/options.cc
@@ -1737,8 +1737,9 @@ void Java_org_rocksdb_Options_prepareForBulkLoad(
  */
 void Java_org_rocksdb_ColumnFamilyOptions_newColumnFamilyOptions(
     JNIEnv* env, jobject jobj) {
-  //rocksdb::ColumnFamilyOptions* op = new rocksdb::ColumnFamilyOptions();
-  //rocksdb::ColumnFamilyOptionsJni::setHandle(env, jobj, op);
+  // TODO(fyrz) needs to be enabled back when ColumnFamilyOptions are available
+  // rocksdb::ColumnFamilyOptions* op = new rocksdb::ColumnFamilyOptions();
+  // rocksdb::ColumnFamilyOptionsJni::setHandle(env, jobj, op);
 }
 
 /*
@@ -2712,8 +2713,9 @@ void Java_org_rocksdb_ColumnFamilyOptions_setMinPartialMergeOperands(
  */
 void Java_org_rocksdb_DBOptions_newDBOptions(JNIEnv* env,
     jobject jobj) {
-  //rocksdb::DBOptions* dbop = new rocksdb::DBOptions();
-  //rocksdb::DBOptionsJni::setHandle(env, jobj, dbop);
+  // TODO(fyrz) needs to be enabled back when DBOptions are available
+  // rocksdb::DBOptions* dbop = new rocksdb::DBOptions();
+  // rocksdb::DBOptionsJni::setHandle(env, jobj, dbop);
 }
 
 /*