Removed old code once and for all.