Tidys code, removes counters. Issues with API.