Removed version checks