Complete code cleanup tasks as per https://www.drupal.org/node/2635158#comment-11061591

Comments

jlicht created an issue.