Opening analysis cleanup