Some commented code was removed.