Cleanup steps 12, 14