Removed unused code.
Created test for tracking.