Removed obsolete changes from original 31 branch