re-structured clean-up
Merge branch 'dk'