Cleanup from static method change