Issue #5: Remove duplicate code and switch to performance configuration.