Removed some if statements that weren't needed