remove fallback VER
more optimizations