Extended clean up