notes and cleanup