Removed version specific code