Remove redundant static class