- Refactoring of condition classes, to make it simpler and easier to understand
- Cleanup unused stuff