Game over, cleaned up TFE more