cleaned up native code in Straylight CLient