Remove dependence on constants