#93 cleanup for the next release