Cleanup unused helpers