remove stable5 fixes