implement an untested fix for #24 and remove remaining panel code