Remove deprecated layout option