Full clean up