Clean up some unnessary if statements