Do not extract abscruact too early
Remove deprecated worker