Added bfgs and configuration calculations to final cleanup