Merge "Remove migrated utils code"