Removed unused helpers and related tests