Remove extension methods, replace with before task