Remove legacy wrapper
Remove unused task