Removed deprecated code rather than just suppressing the warnings...