Removed old deviations (and replaced occurrences with new implemetation)
44 files changed