Cleaned up //trade/ path support