Remove unnecessary use of static