Remove unnecessary Contract checks