Removed deprecated equals calls