Removed commented out code because it is not needed.