Full planning integration into master

Knowledgebase phase of project is complete!
Can these commented lines be removed?