Removed old code; another potential crash source