Removed broken native stuff