Revert "Spec + Controller"

This reverts commit 492ee3a99f5108bff78592b6cc9dc57eb1f8cb30.