Add overshadowing in dedicated cleanup method