Remove else block