Remove static class from setup forms