cidfiles and repository work removed where note relevant. some simplification