Remove reference to ActionController