Port to ST3
Remove out of date task