Removed unused helpers