Merge pull request #1826 from RosettaCommons/everyday847/cleanup_to_prepare_for_bp_efficiency Clean up some code in preparation for bp_efficiency merge