Or better still get rid of that function!