Cleanup and notes