Removed an unused track and fixed a rare collision in untested cases