code cleanup
check server version to be at least 2.6