Remove redundant namespace and and logging to calculations.