DexNav fix
Cleanup for release