Removed some helpers.