Be pedantic about layer cleanup