Planning clean-up
Merge pull request #2135 from jakub-/planning-cleanup

Planning clean-up