Add cleanup to pretender server
Make it a quick fix