Cleanup and a test or two based on the coverage reports.