cleanup/simplify ApplicationController methods