general fixup
cleanup