Remove old commented code.
Fix a stretching problem and remove old commented code