Coverall cleanup