core.layout: cleaning