Merge "Clean up Track constructor"