Removing extraneous assembly creation