diff --git a/conf/core/server.conf b/conf/core/server.conf
index 039284de44da219837e522b6f9282327562eb1f0..ab5d1fb0855f5a68c174a611ebc367ceded9f0b9 100644
--- a/conf/core/server.conf
+++ b/conf/core/server.conf
@@ -68,7 +68,7 @@ MYSQL_USER_NAME=caosdb
 # Password for the user
 MYSQL_USER_PASSWORD=caosdb
 # Schema of mysql procedures and tables which is required by this CaosDB instance
-MYSQL_SCHEMA_VERSION=v4.0.0-rc2
+MYSQL_SCHEMA_VERSION=v4.0.0
 
 
 # --------------------------------------------------
diff --git a/src/main/java/org/caosdb/server/database/DatabaseAccessManager.java b/src/main/java/org/caosdb/server/database/DatabaseAccessManager.java
index 72710dafb3ec7b069e62dd6b1215d13cebc4fc5b..196a9fb2b4418d81ced4b174482f8f6a5dce8ce8 100644
--- a/src/main/java/org/caosdb/server/database/DatabaseAccessManager.java
+++ b/src/main/java/org/caosdb/server/database/DatabaseAccessManager.java
@@ -40,18 +40,18 @@ import org.caosdb.server.utils.Initialization;
 import org.caosdb.server.utils.Releasable;
 
 /**
- * Acquire and release read access. DatabaseMonitor uses this class for managing access to entities
- * during processing updates, inserts, deletions and retrievals. Read access will be granted
- * immediately for every thread that requests it, unless a thread requests that read access be
- * blocked (usually by requesting write access). If this happens, all threads that already have read
- * access will proceed and release their read access as usual but no NEW read permits will be
- * granted.
+ * Acquire and release read access. {@link DatabaseAccessManager} uses this class for managing
+ * access to the back-end during processing updates, inserts, deletions and retrievals. Read access
+ * will be granted immediately for every thread that requests it, unless a thread requests that read
+ * access be blocked (usually by requesting write access). If this happens, all threads that already
+ * have read access will proceed and release their read access as usual but no NEW read permits will
+ * be granted.
  *
  * <p>This is a blockable {@link Semaphore}. Any number of threads may acquire a permit unless it is
  * blocked. The blocking thread (requesting a {@link WriteAccessLock}) waits until all threads have
  * released their permits.
  *
- * @author Timm Fitschen
+ * @author Timm Fitschen <t.fitschen@indiscale.com>
  */
 class ReadAccessSemaphore extends Semaphore implements Releasable {
 
diff --git a/src/main/java/org/caosdb/server/transaction/WriteTransaction.java b/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
index 0f1fd21b19b05db070e54884a41e3d3580798cb1..05ca0428a496e8c26ecb114418c8a9fd19190e71 100644
--- a/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
+++ b/src/main/java/org/caosdb/server/transaction/WriteTransaction.java
@@ -64,9 +64,7 @@ import org.caosdb.server.utils.ServerMessages;
  * BackendTransaction}s for each entity, and handles exceptions, roll-back (if necessary) and clean
  * up afterwards.
  *
- * <p>It initializes and runs the schedule of jobs which
- *
- * @author Timm Fitschen (t.fitschen@indiscale.com)
+ * @author Timm Fitschen <t.fitschen@indiscale.com>
  */
 public class WriteTransaction extends Transaction<WritableContainer>
     implements WriteTransactionInterface {
diff --git a/src/main/java/org/caosdb/server/utils/EntityStatus.java b/src/main/java/org/caosdb/server/utils/EntityStatus.java
index 6687622c24b664573e84518a6ed6ed25ebfa6ec1..d6658ef12535bca15a6af7b1d16a4d3d8c0b5e58 100644
--- a/src/main/java/org/caosdb/server/utils/EntityStatus.java
+++ b/src/main/java/org/caosdb/server/utils/EntityStatus.java
@@ -42,14 +42,8 @@ package org.caosdb.server.utils;
  *   <li>VALID - This instance has a final ID and has been synchronized with the database.
  * </ul>
  *
- * @author Timm Fitschen
+ * @author Timm Fitschen <t.fitschen@indiscale.com>
  */
-
-// TODO Can these comment lines be removed?
-//  * <li>WRITTEN - This instance has been written successfully to the database. It has a final ID.
-//  * //  * <li>CORRUPT - This instance has
-//  * been retrieved from the database, but though something turned out to be wrong with it.
-
 public enum EntityStatus {
   IGNORE,
   UNQUALIFIED,