Cleaning things up and switch to Kontrol2 from Kontrol