Refactor to remove unnecessary repeat of artifact checking
Remove unneeded values from plugin call
Streamline
Promote to release version