Remove two SRP violations