clean up surround