CALC-241 - Delete and reorder calculation step (from home page)
Code clean