remove deprecated core-layout