adding version cleanup and skipping