Removed (commented) old code