Removed some pesky elifs.

Fixing more