Revert "Merging from Controllers"

This reverts commit 85679b1508b408b515708d31e8568e75286ee69b.