Removed hacks for debug toolbar
Merge pull request #1396 from cmfcmf/debug-toolbar-remove-hacks

Removed hacks for debug toolbar