Remove unused commands
Break down the file into smaller files
Merge commit '4f09798a7d1b79cd2017a7c2e894460b184ce628' into develop

* commit '4f09798a7d1b79cd2017a7c2e894460b184ce628':
  Take reviewer comments into account.
Take a few more comments into account
Fix broken URL to experimental data