Revert "Updates on server startup"

This reverts commit 98df6f14376c26a063a2cb11cf5ccb60264af96b.
Revert 98df6f1..5b3f93f

This rolls back to commit 98df6f14376c26a063a2cb11cf5ccb60264af96b.