Since you removed Wiki Markup from normal Page, the Template are impossible to work with. It's a real pain to manage them because we can no longer edit a current page and copy/paste the Markup to the Template page.

If my company knew we would lose Wiki Markup, we would have never moved to confluence 4.0. It was used across all our departments and we lost a lot of time and money with the new Editor and the loss of features.