Remove unneeded call - lazy support