Remove now unused function
Use Model API rather than Repository API