Remove redundant static class

This takes care of the last TODO!