Delete commented out code
Merge https://github.com/hrydgard/native