Removed hardcoding for version