Change some methods to static and remove imports