some clean-up and notes for next steps