Removed hardcode versions where used elsewhere for T3-1195