cleanup of analysis part