Repository tidy up