Fix failing test and remove old, unused method