cleanup of common