Removed controller concerns