cleanup from review with @dirk-thomas