Fix compile issue - Remove junk code