ENH: Cleaning tract definitions