Repository Revolution - starting model clean up