merged cleanup