Remove now unused functions