Removed unused controller concern - closes #933

Merging into 2.0