remove deprecated layout