Clean up: These should all be static