Finish removing template conditionals for logo and remove login() calls