Closes #95

Instructions on setup.script
diff --git a/guide/ops/gui/running.md b/guide/ops/gui/running.md
index ef8edca..f73ffb2 100644
--- a/guide/ops/gui/running.md
+++ b/guide/ops/gui/running.md
@@ -38,6 +38,9 @@
 INFO  Started Brooklyn console at http://127.0.0.1:8081/, running classpath://brooklyn.war
 </pre>
 
+_Notice! Before launching Apache Brooklyn, please check the `date` on the local machine.
+Even several minutes before or after the actual time could cause problems._
+
 ## Connect with Browser
 
 Next, open the web console on [http://127.0.0.1:8081](http://127.0.0.1:8081). 
diff --git a/guide/ops/persistence/index.md b/guide/ops/persistence/index.md
index 30c3d5f..57996cb 100644
--- a/guide/ops/persistence/index.md
+++ b/guide/ops/persistence/index.md
@@ -170,6 +170,20 @@
 * `--transformations` <transformations>
   The local transformations file to be applied to the copy of the data before uploading it.
 
+## CLI Commands for Cleaning Orphaned State
+
+Brooklyn includes a command to clean orphaned state which uses the copy state command
+and removes orphaned locations, enrichers, policies and feeds from the copied state.
+The `clean-orphaned-state` CLI command takes the following arguments:
+
+* `--persistenceDir` <source persistence dir>
+  The directory to read persisted state (or container name if using an object store).
+* `--persistenceLocation` <source persistence location>
+  The location spec for an object store to read persisted state.
+* `--destinationDir` <target persistence dir>
+  The directory to copy persistence data to, with orphaned state removed.
+* `--destinationLocation` <target persistence location>
+  The location spec for an object store to copy data to.
 
 ## Handling Rebind Failures
 
diff --git a/guide/ops/troubleshooting/deployment.md b/guide/ops/troubleshooting/deployment.md
index 9cfc4af..9e85dec 100644
--- a/guide/ops/troubleshooting/deployment.md
+++ b/guide/ops/troubleshooting/deployment.md
@@ -30,6 +30,11 @@
 
 An error like `... Not authorized to access cloud ...` usually means the wrong identity/credential was used.
 
+AWS requires a X-Amz-Date header which contains the date of the Apache Brooklyn AWS client.
+If the date on the server is wrong, for example several minutes behind you will get Authorization Exception.
+Please be sure that the machine which is running Apache Brooklyn set its clock correctly.
+To set the time on Linux we advice to use the ntp client: `sudo ntpdate pool.ntp.org`.
+
 An error like `Unable to match required VM template constraints` means that a matching image (e.g. AMI in AWS terminology) could not be found. This 
 could be because an incorrect explicit image id was supplied, or because the match-criteria could not
 be satisfied using the given images available in the given cloud. The first time this error is 
diff --git a/guide/start/running.md b/guide/start/running.md
index 12758c8..1d5f81a 100644
--- a/guide/start/running.md
+++ b/guide/start/running.md
@@ -218,6 +218,8 @@
 The application should then output its log into the console and also `c:\Program Files\brooklyn\apache-brooklyn.debug.log` and `c:\Program Files\brooklyn\apache-brooklyn.info.log`
 
 </div>
+_Notice! Before launching Apache Brooklyn, please check the `date` on the local machine.
+Even several minutes before or after the actual time could cause problems._
 </div>
 
 ---