Removed non trackAll calls