Can be removed, see comment on task below