Deleted some commented-out codes.