Cleaned up recursive retries and pom version