Removing unnecessary checks in sts