Removed temporarily commented out code