Now that we have Rajkosto's check, removing the unnessecairy checks in the files themselves. Didn't change other changes that commit made.