Responding to feedback

- Simplifying track generation logic
- Handling track deletion