Removed unnecessary and broken helper