cleanup, fix preset crash