cwave images cleanup