removed some unused helpers