Removed some old code, no functionality changed.