Refactored tie discards, removed some logging