Do dditional clean-up