cleanup and reminder fix