Fixed date calculations + lots of cleaning.
Merge branch 'dev--stable' into lessDiskSpace