Pulled code out of heli.h that should have never been there