Clean up some unused infrastructure definitions

Sam Thursfieldrequested to merge
sam/cleanup into master

Our production setup is in sync with these changes.

Merge request reports