Code cleanup, vers is now factored in