Remove else section from pull #490