Cleaned up some native Code