NXP-7971: remove remnants of the original layout system