Clean up: These should be static