Remove coupling of fragment & task