Fix travis builds
Make tags removal compatible with 2.0