Cleanup of mock server - WORKING