[TASK] Remove layout type