Remove unnecessary layout calls from heap