cleanup and notes