Remove set_variables_dependencies call
Implement reforms in calculate controller