Version & Dump, remove conflicts with the stubs