Remove retry mechanism and refactor logging bits