Rounding the courner for final clean-up