Remove elif