Clean up unused helpers