Remove some confusing else statements.
Comment From: pivotal-issuemaster
@ynfeng Please sign the Contributor License Agreement!
Click here to manually synchronize the status of this Pull Request.
See the FAQ for frequently asked questions.
Comment From: pivotal-issuemaster
@ynfeng Thank you for signing the Contributor License Agreement!