Cleanup
Merge pull request #27 from ministryofjustice/cleanup

Cleanup