[TASK] Remove Layout defined in Partial