branch cleanup and replace with latest stable version