Further simplification of repository code