This commit marks unused deprecated methods and constants for removal
and removes deprecated internal methods and fields