fixup
remove osx::recovery_message
fixup more class issues