clean up Cleanup
add comments
use more xpath instead of fragile CSS selectors, remove non working code from combination track test