Clean up + Thread background fix