Layout and index removal