remove cruft, streamline
remove cruft, streamline

remove an "&& false" branch, then merge the always-branch down into the
surrounding code so that it makes more sense

Change-Id: Ia468ceac4d7e72a70e56bbe9025d76a052846f70
Reviewed-on: https://gerrit.instructure.com/31581
Tested-by: Jenkins <d95b56ce41a2e1ac4cecdd398defd7414407cc08@instructure.com>
Reviewed-by: Braden Anderson <a6cc2cef7d25f27847876bdb81651755fcebacf0@instructure.com>
Product-Review: Jacob Fugal <f862f167b85d41b225785c70d70808bc7337c1fe@instructure.com>
QA-Review: Jacob Fugal <f862f167b85d41b225785c70d70808bc7337c1fe@instructure.com>

utkarshx/canvas-lms,HotChalk/canvas-lms,Jyaasa/canvas-lms,snehakachroo1/LSI_replica,djbender/canvas-lms,sfu/canvas-lms,instructure/canvas-lms,wrdsb/canvas-lms,juoni/canvas-lms,antoniuslin/canvas-lms,samuels410/greatlakes-lms,Rvor/canvas-lms,arrivu/hoodemo,skmezanul/canvas-lms,Unow/canvas-lms,SwinburneOnline/canvas-lms,sdeleon28/canvas-lms,sfu/canvas-lms,matematikk-mooc/canvas-lms,grahamb/canvas-lms,efrj/canvas-lms,roxolan/canvas-lms,narigone/canvas,leftplusrightllc/canvas-lms,tgroshon/canvas-lms,usmschuck/canvas,arrivu/hoodemo,Rvor/canvas-lms,utkarshx/canvas-lms,samuels410/greatlakes-lms,AndranikMarkosyan/lms,shidao-fm/canvas-lms,narigone/canvas,ShreniiNepal/shrenii_lmp,dgynn/canvas-lms,greyhwndz/canvas-lms,samuels410/greatlakes-lms,greyhwndz/canvas-lms,usmschuck/canvas,matematikk-mooc/canvas-lms,ShreniiNepal/shrenii_lmp,skmezanul/canvas-lms,matematikk-mooc/canvas-lms,ShreniiNepal/shrenii_lmp,whalejasmine/canvas-lms,venturehive/canvas-lms,shidao-fm/canvas-lms,wrdsb/canvas-lms,shidao-fm/canvas-lms,redconfetti/canvas-lms,snehakachroo1/LSI_replica,tgroshon/canvas-lms,grahamb/canvas-lms,jay3126/canvas-lms,redconfetti/canvas-lms,SwinburneOnline/canvas-lms,juoni/canvas-lms,sfu/canvas-lms,snehakachroo1/LSI_replica,gbleydon/canvas-lms,redconfetti/canvas-lms,sfu/canvas-lms,greyhwndz/canvas-lms,efrj/canvas-lms,eCNAP/CANVAS,HotChalk/canvas-lms,dgynn/canvas-lms,usmschuck/canvas,sdeleon28/canvas-lms,greyhwndz/canvas-lms,arrivu/arrivu-lms,va7map/canvas-lms,whalejasmine/canvas-lms,HotChalk/canvas-lms,Rvor/canvas-lms,fronteerio/canvas-lms,dgynn/canvas-lms,utkarshx/canvas-lms,AndranikMarkosyan/lms,SwinburneOnline/canvas-lms,leftplusrightllc/canvas-lms,narigone/canvas,tgroshon/canvas-lms,djbender/canvas-lms,va7map/canvas-lms,kyroskoh/canvas-lms,gbleydon/canvas-lms,fronteerio/canvas-lms,kyroskoh/canvas-lms,AndranikMarkosyan/lms,usmschuck/canvas,Jyaasa/canvas-lms,ShreniiNepal/shrenii_lmp,redconfetti/canvas-lms,sfu/canvas-lms,fronteerio/canvas-lms,sdeleon28/canvas-lms,narigone/canvas,jay3126/canvas-lms,efrj/canvas-lms,eCNAP/CANVAS,kyroskoh/canvas-lms,va7map/canvas-lms,dgynn/canvas-lms,leftplusrightllc/canvas-lms,djbender/canvas-lms,sdeleon28/canvas-lms,utkarshx/canvas-lms,juoni/canvas-lms,whalejasmine/canvas-lms,leftplusrightllc/canvas-lms,instructure/canvas-lms,arrivu/hoodemo,wye0220/shindig-canvas,grahamb/canvas-lms,juoni/canvas-lms,jay3126/canvas-lms,efrj/canvas-lms,eCNAP/CANVAS,antoniuslin/canvas-lms,Unow/canvas-lms,fronteerio/canvas-lms,wrdsb/canvas-lms,wye0220/shindig-canvas,roxolan/canvas-lms,gbleydon/canvas-lms,Rvor/canvas-lms,whalejasmine/canvas-lms,samuels410/greatlakes-lms,jay3126/canvas-lms,instructure/canvas-lms,venturehive/canvas-lms,wrdsb/canvas-lms,tgroshon/canvas-lms,skmezanul/canvas-lms,antoniuslin/canvas-lms,instructure/canvas-lms,wye0220/shindig-canvas,sfu/canvas-lms,Jyaasa/canvas-lms,antoniuslin/canvas-lms,sfu/canvas-lms,arrivu/arrivu-lms,instructure/canvas-lms,Jyaasa/canvas-lms,venturehive/canvas-lms,HotChalk/canvas-lms,kyroskoh/canvas-lms,instructure/canvas-lms,grahamb/canvas-lms,AndranikMarkosyan/lms,shidao-fm/canvas-lms,Unow/canvas-lms,roxolan/canvas-lms,eCNAP/CANVAS,SwinburneOnline/canvas-lms,va7map/canvas-lms,skmezanul/canvas-lms,matematikk-mooc/canvas-lms,grahamb/canvas-lms,roxolan/canvas-lms,arrivu/arrivu-lms,djbender/canvas-lms,venturehive/canvas-lms,snehakachroo1/LSI_replica,instructure/canvas-lms