Moved odd retry logic out of repo for now, cleaned up some code