Remove file
Improve Task query