43616-180 Cleanup