Yep, agreed -- I've gone through all of the tests and removed the unnecessary checks