Removing dependencies on softwaremill-common-util