Are the changes to academicsController.js part of this JIRA? They look unrelated. And it looks like you're taking away functionality that we want for some test users.