Get rid of native property
Clean up modules