Further progress cleanup