Remove static nonsense
Make constructor for utility class private