clean up of normal calc