Clean up static implementation