further cleanup and updating of repos