Added function for removing trackingpoints
Reconfigured routing