Get rid of context in tasks