throwing out redundant code in ApplicationController
Merge commit 'ed7a4819a8460ca3da2eb7cbe9c1d1c7a3293208'