Cleanup: removed functions deprecated in 1.5