removed calc dependency