Moving any view / tpl like code from includes into tpl
Clean up some old run code now that SL and Cron work without it as well