remove cruft, add noteon feature