Cleaned up category replacing issues.