#195 cleaned up native