after review cleanup