cleanup and update to latest tag