I guess the "remove legacy block" part is a left over from development - isn't it?