Removed some commented old code