Pre-2.0 cleanup

This cleanup breaks backwards compatibility in less used features, but I think that it is acceptable for the upcoming 2.0 release.

Merge request reports

Loading