Remove two no longer relevant layout items.