minor removal of deprecated internal methods