Added utils.
Remove unused usage.
Minor fixes.