cleanup pre-rick