Removing more code
More adaptations