Add cleanup to pretender server
Make it a quick fix
Merge branch 'develop'