Remove conditional conde
Remove condtional tests
Cleanup resultant code
Bumb major version = breaking API changes
Missed a spot