Removed commented out code so that it doesn't 'rot'