Removed some helpers