removed logging, fixed bug in final calc strategy