Ignore some things, tidy up USD module