Removing extra unneeded checks in Trail