cleanup prior to adding metrics checks