More unnecessary default tile logic removed