Code clean-up to remove "deceiving" functionality that really only works in Rhino