Cleaned up the refactor's auto completes.