Remove utils to make it part of separate PR.