[TASK] Cleanup ce layouts