Remove redundabt code after Argonaut move