Continue slipstream cleanup, still doesn't work