Fixed build.
Reduced complexity.