Removing traces & cleanup