Commit possibly incomplete cleanup